cheat sheet: Suggest git-restore for discarding changes #2079
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In modern versions of Git, `git status` will suggest using `git restore` in these cases. Also, in all other instances, the cheat sheet already lists `git switch` or `git restore` alternatives to `git checkout`.
|
This makes sense to me. |
|
I was interested what exactly means "modern versions of git" in this context... The official docs also list 2.23.0 as the oldest version of git 2.23.0 was released in August 2019 And thank you for the cheat sheet! |
|
I agree with @christophprokop. Personally I would like to double down on |
To1ne
approved these changes
Sep 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In modern versions of Git,
git statuswill suggest usinggit restorein these cases. Also, in all other instances, the cheat sheet already listsgit switchorgit restorealternatives togit checkout.Changes
git restore <file>andgit restore --staged --worktree <file>as alternatives togit checkout <file>andgit checkout HEAD <file>, respectively.Context
Make the cheat sheet more consistent with
git status. Also, when teaching Git to new users, usinggit switchandgit restoreconsistently in place ofgit checkoutarguably makes common workflows easier to understand; and being able to point those new users to the official cheat sheet without introducing new commands would be a big bonus.